(Frecenter): When changing the window start, set the

window's window_end_valid to nil.
(Fwindow_end): Fix window-end computation when UPDATE is non-nil.

diff --git a/src/window.c b/src/window.c
index ac12c1ee8046665524d23df536c8aa447ec661e2..5d779026bad78728fc0acb8d489c02d5f55eac0d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -908,6 +908,7 @@ if it isn't already recorded.")
         cope with variable-height lines.  */
       start_display (&it, w, startp);
       move_it_vertically (&it, window_box_height (w));
+      move_it_past_eol (&it);
       value = make_number (IT_CHARPOS (it));
     }
   else
@@ -4555,6 +4556,7 @@ and redisplay normally--don't erase and redraw the frame.")
 
   /* Set the new window start.  */
   set_marker_both (w->start, w->buffer, charpos, bytepos);
+  w->window_end_valid = Qnil;
   w->force_start = Qt;
   if (bytepos == BEGV_BYTE || FETCH_BYTE (bytepos - 1) == '\n')
     w->start_at_line_beg = Qt;